-
Notifications
You must be signed in to change notification settings - Fork 426
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix and simplify overlays #3766
Conversation
7c75c05
to
654e815
Compare
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
654e815
to
eaa6bfb
Compare
Codecov ReportBase: 82.83% // Head: 17.87% // Decreases project coverage by
Additional details and impacted files@@ Coverage Diff @@
## master #3766 +/- ##
===========================================
- Coverage 82.83% 17.87% -64.96%
===========================================
Files 531 531
Lines 34083 34066 -17
===========================================
- Hits 28233 6090 -22143
- Misses 5850 27976 +22126
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. ☔ View full report at Codecov. |
This comment was marked as outdated.
This comment was marked as outdated.
This way there is only one overlay file, and the overlays work correctly with the latest Rebar3. As we do some templating in our tools, they need to support file inclusion as well.
It is easier to modify vars-toml.config directly
eaa6bfb
to
efee290
Compare
small_tests_24 / small_tests / efee290 small_tests_25 / small_tests / efee290 dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / efee290 ldap_mnesia_24 / ldap_mnesia / efee290 ldap_mnesia_25 / ldap_mnesia / efee290 dynamic_domains_mysql_redis_25 / mysql_redis / efee290 dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / efee290 dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / efee290 internal_mnesia_25 / internal_mnesia / efee290 elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / efee290 bosh_SUITE:essential:accept_higher_hold_value{error,
{{assertEqual,
[{module,bosh_SUITE},
{line,251},
{expression,"get_bosh_sessions ( )"},
{expected,[]},
{value,
[{bosh_session,<<"c94942b635deb2b239aff10c32b1b797265469dc">>,
<9159.5104.0>}]}]},
[{bosh_SUITE,accept_higher_hold_value,1,
[{file,"/home/circleci/project/big_tests/tests/bosh_SUITE.erl"},
{line,251}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1782}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1291}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1223}]}]}} pgsql_mnesia_24 / pgsql_mnesia / efee290 pgsql_mnesia_25 / pgsql_mnesia / efee290 mysql_redis_25 / mysql_redis / efee290 mssql_mnesia_25 / odbc_mssql_mnesia / efee290 push_integration_SUITE:pubsub_ful:pm_notifications_with_inbox:inbox_msg_unread_count_apns{error,
{{assertMatch,
[{module,push_integration_SUITE},
{line,662},
{expression,"Data"},
{pattern,"# { << \"message-count\" >> := ExpectedCount }"},
{value,
#{<<"last-message-body">> => <<"Private message">>,
<<"last-message-sender">> =>
<<"kate_inbox_msg_unread_count_apns_2726@localhost">>,
<<"message-count">> => 1}}]},
[{push_integration_SUITE,check_notification,2,
[{file,
"/home/circleci/project/big_tests/tests/push_integration_SUITE.erl"},
{line,662}]},
{escalus_story,story,4,
[{file,
"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
{line,72}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1782}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1291}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1223}]}]}} riak_mnesia_24 / riak_mnesia / efee290 pubsub_SUITE:dag+basic:subscribe_options_test{error,{{badmatch,{{<<"pubsub#deliver">>,<<"boolean">>,<<"false">>},
<<"pubsub#deliver">>}},
[{pubsub_tools,'-verify_form_values/2-fun-0-',2,
[{file,"/home/circleci/project/big_tests/tests/pubsub_tools.erl"},
{line,650}]},
{lists,foreach,2,[{file,"lists.erl"},{line,1342}]},
{pubsub_SUITE,'-subscribe_options_test/1-fun-1-',3,
[{file,"/home/circleci/project/big_tests/tests/pubsub_SUITE.erl"},
{line,455}]},
{escalus_story,story,4,
[{file,"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
{line,72}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1783}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1292}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1224}]}]}} elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / efee290 mssql_mnesia_25 / odbc_mssql_mnesia / efee290 inbox_extensions_SUITE:async_pools:one_to_one:mute_muted_entry_gets_unmuted{error,
{{assert,
[{module,inbox_extensions_SUITE},
{line,798},
{expression,"escalus_pred : is_message ( Message )"},
{expected,true},
{value,false}]},
[{inbox_extensions_SUITE,check_message_with_properties,4,
[{file,
"/home/circleci/project/big_tests/tests/inbox_extensions_SUITE.erl"},
{line,798}]},
{inbox_extensions_SUITE,set_inbox_properties,4,
[{file,
"/home/circleci/project/big_tests/tests/inbox_extensions_SUITE.erl"},
{line,792}]},
{inbox_extensions_SUITE,'-mute_muted_entry_gets_unmuted/1-fun-2-',2,
[{file,
"/home/circleci/project/big_tests/tests/inbox_extensions_SUITE.erl"},
{line,568}]},
{escalus_story,story,4,
[{file,
"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
{line,72}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1782}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1291}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1223}]}]}} mssql_mnesia_25 / odbc_mssql_mnesia / efee290 pep_SUITE:pep_tests:unsubscribe_after_presence_unsubscription{error,
{{badmatch,
[{xmlel,<<"message">>,
[{<<"from">>,
<<"alice_unsubscribe_after_presence_unsubscription_2461@localhost">>},
{<<"to">>,
<<"bob_unsubscribe_after_presence_unsubscription_2461@localhost/res1">>},
{<<"type">>,<<"headline">>}],
[{xmlel,<<"event">>,
[{<<"xmlns">>,
<<"http://jabber.org/protocol/pubsub#event">>}],
[{xmlel,<<"items">>,
[{<<"node">>,<<"/vBoHP2UkFGPh/qvprm6qA==">>}],
[{xmlel,<<"item">>,
[{<<"id">>,<<"salmon">>}],
[{xmlel,<<"entry">>,
[{<<"xmlns">>,
<<"http://www.w3.org/2005/Atom">>}],
[]}]}]}]},
{xmlel,<<"headers">>,
[{<<"xmlns">>,<<"http://jabber.org/protocol/shim">>}],
[]}]}]},
[{pep_SUITE,'-unsubscribe_after_presence_unsubscription/1-fun-0-',2,
[{file,"/home/circleci/project/big_tests/tests/pep_SUITE.erl"},
{line,384}]},
{escalus_story,story,4,
[{file,
"/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
{line,72}]},
{test_server,ts_tc,3,[{file,"test_server.erl"},{line,1782}]},
{test_server,run_test_case_eval1,6,
[{file,"test_server.erl"},{line,1291}]},
{test_server,run_test_case_eval,9,
[{file,"test_server.erl"},{line,1223}]}]}} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
okk
As stated in the rebar3 docs:
This is why we can just include the overlay files:
configure.vars.config
intovars-toml.config
vars-toml.config
into*.vars-toml.config
This way the overlays work correctly with the latest Rebar3, and there is no need to concatenate the files with
make
.We have some templating utilities for tests, and they needed support for file inclusion as well.